From 972cf95cd24e4a4015b2eee210f49497c186feb2 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 28 Jun 2005 08:08:24 +0000 Subject: [PATCH] bitkeeper revision 1.1760.1.4 (42c10578DlONZUYkjuzFvNR6idseEQ) Simplify x86_32 boot code by removing bogus P6 check (really it was a 486 check, and we can assume everyone has CPUID I think). Signed-off-by: Keir Fraser --- xen/arch/x86/boot/x86_32.S | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/xen/arch/x86/boot/x86_32.S b/xen/arch/x86/boot/x86_32.S index 75d3b57bf0..dc1df01e2a 100644 --- a/xen/arch/x86/boot/x86_32.S +++ b/xen/arch/x86/boot/x86_32.S @@ -20,16 +20,10 @@ ENTRY(start) /* Checksum: must be the negated sum of the first two fields. */ .long -0x1BADB005 -bad_cpu_msg: - .asciz "ERR: Not a P6-compatible CPU!" not_multiboot_msg: .asciz "ERR: Not a Multiboot bootloader!" -bad_cpu: - mov $bad_cpu_msg-__PAGE_OFFSET,%esi - jmp print_err not_multiboot: mov $not_multiboot_msg-__PAGE_OFFSET,%esi -print_err: mov $0xB8000,%edi # VGA framebuffer 1: mov (%esi),%bl test %bl,%bl # Terminate on '\0' sentinel @@ -61,19 +55,6 @@ __start: pushl $0 popf - /* CPU type checks. We need P6+. */ - mov $0x200000,%edx - pushfl - pop %ecx - and %edx,%ecx - jne bad_cpu # ID bit should be clear - pushl %edx - popfl - pushfl - pop %ecx - and %edx,%ecx - je bad_cpu # ID bit should be set - /* Set up FPU. */ fninit -- 2.30.2